git conflict

visit shbcf.ru